cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,811 Commits 8 Branches 0 Tags
a101b51fa0f3c4ce51e4bc7952c4595cfb1cc5c1
Commit Graph

9057 Commits

Author SHA1 Message Date
Albert Iordache
b78c942f35 Merge pull request #2392 from CIB/master 
Fixes random events
 2013-02-20 15:13:03 -08:00
cib
35bf0648ae Fixes events being broken. 
The proc to get active playercounts was utterly broken, which led to there only being events that needed no specific requirements. Fixed, and made events more common(the only reason people were pissed about so many events was that only the annoying ones would spawn ever).
 2013-02-20 23:05:48 +01:00
Christian Bielert
f2b9816810 Merge pull request #2389 from comma/bleeding-edge-freeze 
Guns, medicine and fixes.
 2013-02-20 13:22:57 -08:00
Christian Bielert
ec54b0501e Merge pull request #2390 from Uristqwerty/master 
Fixed infinite loop in powernet rebuild. (Issue #2385)
 2013-02-20 13:18:21 -08:00
Uristqwerty
b1c20c32d7 Fixed infinite loop in powernet rebuild. 
If a /obj/machinery/power wasn't anchored, it wouldn't get a new list of connections, so would endlessly loop on the old list, of which that object was the first entry, ensuring that the loop would never terminate.
 2013-02-20 14:47:32 -05:00
Christian Bielert
d43b798474 Merge pull request #2387 from comma/master 
Fixes issue #2384
 2013-02-20 10:54:04 -08:00
Chinsky
6015df7178 Tweaks to side effects. 
Removed itch one. Caused lots of whining, since it's quite counterintuitive to take drugs to treat itch instead of scratching it or removing bandage.
Made side effects contracting probability-based, probability higher the stronger chemical is.
 2013-02-20 20:00:01 +04:00
Chinsky
4e35fccdb7 Fixed issue with laser beams freezing forever in case they missed the mob. 2013-02-20 19:30:13 +04:00
Chinsky
b649ab5a44 Fixes projectiles still applying effects even if they missed. 2013-02-20 17:33:48 +04:00
Chinsky
4a6f719f35 Added crowbar as alternative to retractor. 2013-02-20 15:57:50 +04:00
Chinsky
b1272bb987 Merge pull request #2378 from caelaislinn/master 
Remove debug string
 2013-02-20 03:02:34 -08:00
Cael_Aislinn
93ef7b83d8 replaced infestation slimes with spiderlings (with 0% chance to grow into giant spiders), reduced spiderling noisiness, made them less jittery (easier to squish) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-20 20:56:09 +10:00
Chinsky
fa1d81fbae Fixed derp. 
Compile errors because I am retarded.
 2013-02-20 10:38:36 +04:00
Chinsky
69c32e1e61 Merge branch 'bleeding-edge-freeze' into gun 2013-02-20 10:22:12 +04:00
Zuhayr
d261e3836f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-02-20 12:36:22 -08:00
Zuhayr
cdb3907493 Binary file merge conflict. 2013-02-20 00:28:14 -08:00
Zuhayr
1fe4cbb619 Added a mantle and robe for Unathi to wear, added weldermask vision reduction for Unathi helmets, changed instances of soghun to 'Unathi' where needed. 2013-02-20 00:24:26 -08:00
Chinsky
10ba1e5e6c Merge pull request #2386 from Uristqwerty/master 
Non-animated runes not cached.
 2013-02-19 21:21:35 -08:00
Chinsky
28c8c67946 Fixes issue #2384 Uplink now spawns proper implanters. Fixed missing icon for compressed matter implant. 2013-02-20 09:20:32 +04:00
Chinsky
df67151fe3 Merge branch 'master' into bleeding-edge-freeze 2013-02-20 09:18:14 +04:00
Chinsky
41f09299c9 Compressed implant item now will be put in hands instead of the floor. 2013-02-20 09:17:41 +04:00
Chinsky
eb03e35296 Fixes issue #2384 
Uplink now spawns proper implanters.
Fixed missing icon for compressed matter implant.
 2013-02-20 09:15:27 +04:00
Chinsky
65d79e6ec1 Fixed runtime in traitor equip. 2013-02-20 08:58:09 +04:00
Uristqwerty
29f1095a25 Non-animated runes aren't being cached, probably a bug. 2013-02-19 23:40:06 -05:00
Chinsky
3202ac4ccf Fixes runtime with burn wounds not having enough stages. 2013-02-20 00:38:43 +04:00
Chinsky
b12594f561 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-02-19 21:38:26 +04:00
Chinsky
0eca1bd4e4 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-19 18:46:29 +04:00
Chinsky
261577317e Merge pull request #2373 from CIB/master 
Several bugfixes
 2013-02-19 06:44:05 -08:00
RavingManiac
839d4cb6c8 Added var/small to mobs, which currently only handles if they can open airlocks. This replaces the use of ismouse(). 2013-02-19 22:10:27 +08:00
Chinsky
2ae3fdf122 Fixed derp in surgery step. 
Forgot they all instanced at init, not on demand.
 2013-02-19 17:51:04 +04:00
Chinsky
6b80916e6e Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-19 17:41:24 +04:00
Chinsky
54e958d186 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-02-19 16:44:30 +04:00
RavingManiac
254b5cccd4 Some uses of ismouse() replaced with isanimal() 
world.time used to calculate mouse spawn timer.

Spawn timer now applies to being killed via splat().
 2013-02-19 19:22:00 +08:00
Zuhayr
41026faf0f Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-02-18 21:28:04 -08:00
Cael_Aislinn
ad227f0925 removed debug string, bumped event intervals, decreased probability of some events 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-19 15:12:00 +10:00
Cael_Aislinn
8cd47739d2 removed event debug string, bumped up minimum event interval, tweak to space carp 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-19 14:04:33 +10:00
RavingManiac
b2b2894e3b Players have to wait 5 minutes between dying as a mouse and respawning as a mouse. Global variable mouse_respawn_time determines the respawn time in minutes. 
Mice can no longer open airlocks.

Mice can no longer strip items from humans

Mice can no longer put other creatures into disposal units (though they can still climb into disposal units)

Message for when mice crawl into vents removed. Mouse nibbling message only displayed to observers half the time.
 2013-02-19 08:04:53 +08:00
cib
18a552af0a Fixed problem where hostile animals would attack even the dead. 2013-02-18 23:35:51 +01:00
cib
0e70040810 Fix to issue #2371 
Increased the simple_animal/hostile/move_to_delay, which seems to be an entirely separate value for speed. This code is so messed up.
 2013-02-18 23:30:20 +01:00
cib
da8e83710f Fixes issue #2367 
Even characters created before nt_relation option now get to choose.
 2013-02-18 23:02:03 +01:00
cib
3df671f8d0 Attempt to fix issue #2371 
- Halves drone speed
- Copied over the exact values from space-carp for spaceproofness, though it should already have worked before
- Untested(whooo uni)
 2013-02-18 22:52:41 +01:00
Christian Bielert
9881020742 Merge pull request #2370 from comma/surgery 
Sticking it in people
 2013-02-18 13:40:44 -08:00
Chinsky
334da25223 Added surgery to put things in people. 2013-02-18 13:22:23 +04:00
Gamerofthegame
437cca538b Merge branch 'bleeding-edge-freeze' of https://github.com/Gamerofthegame/Baystation12 into bleeding-edge-freeze 2013-02-18 00:07:40 -05:00
Cael_Aislinn
24763f8bb0 removed debug output, cleanup of alien languages, bumped tajaran darkseeing 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-18 13:07:01 +10:00
Cael_Aislinn
2b4827692c tweakfixes to admin PMs 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-18 13:06:07 +10:00
Cael_Aislinn
6918fb0ef9 new crew manifest for id computers, tweaks to manifest to better fit window, renamed roboticist alt title post-feedback 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-18 12:56:57 +10:00
Jamini
15fcdafe8e Third time is a charm. Fixed a bunch of map things and reverted the axe back to it's premerge values. Also added airlocks back to mining. 
Signed-off-by: Jamini <mobiousjami@gmail.com>
 2013-02-17 20:59:36 -05:00
Gamerofthegame
64c72ef969 Adds the ERT to the debug command for adminnery. Not exactly like the pre-merge one, as that was based off something else so I couldn't copy-paste. It should give admins a easier time of making things up, though, and so long as future plans go into effect a admin ought to be able to do it on the fly in less then a minute. 2013-02-17 18:15:07 -05:00
Chinsky
4a1198bfe4 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-02-18 00:11:51 +04:00