cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,749 Commits 5 Branches 0 Tags
a1a29e76a7d42562da5f044e8c70e59eb13093d0
Commit Graph

4993 Commits

Author SHA1 Message Date
Chinsky
a1a29e76a7 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	code/modules/events/infestation.dm
 2013-02-21 12:00:33 +04:00
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
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
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
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
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
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
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
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
Cael_Aislinn
fea6635060 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	code/game/verbs/who.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-18 01:25:47 +10:00
Chinsky
92c8c34c2a Removed getDisplayNameProc(), since all organs have display_name var anyway. 
Moved some severed head code into it's New() for readability.

Fixed noexplode flag in droplimb still making limb give explosion message.
 2013-02-17 19:12:00 +04:00
Cael_Aislinn
da9b87a288 beepsky now fights hostile NPC mobs, and vice versa 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-18 00:32:49 +10:00
Chinsky
948e859d80 Fixes #2343 (and #2342), #2356 Readded pre-merge bottle and pill icon choosing system. 2013-02-17 18:31:03 +04:00
Chinsky
0cb4e29a4a Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-02-17 17:51:09 +04:00
Chinsky
a68e5d3875 Merge pull request #2333 from Baystation12/BEF-staging 
Merge on the 16th if no issues
 2013-02-17 04:44:25 -08:00
Cael_Aislinn
4b69afd15b made carp migration actually end (carp disappear back into the void) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-17 11:17:45 +10:00
Chinsky
226a96b38f If bullet misses someone it does not disappear, but continues on its way. 2013-02-16 21:02:38 +04:00
Chinsky
9c43050ba7 Change to check_zone proc. 
It makes possible to target hands/feet/groin.
Not sure what side effects would this change have.
 2013-02-16 19:01:48 +04:00
Chinsky
106018ca3b Fix for firing distance calculation. 
'original' var is not a starting point of projectile, but an atom it was fired at initially.
'starting' is turf where projectile was fired from.
 2013-02-16 19:00:49 +04:00
Chinsky
764fa03a17 Fix for negative miss chance modificators working. 2013-02-16 18:58:43 +04:00
Chinsky
bfe9b3839e Merge branch 'gun' of https://github.com/comma/Baystation12 into gun 2013-02-16 18:53:20 +04:00
Chinsky
7a94494eee Merge pull request #2354 from Zuhayr/master 
Posibrain fixes (double name, protolathe, double binary)
 2013-02-16 02:22:47 -08:00
Zuhayr
4dd7141e32 Removing a debug string. 2013-02-16 16:19:39 -08:00
Zuhayr
6ad09d49c8 Fixes for posibrain name generation, research design for protolathe, possible for for double-say for posibrains (cannot test locally). 2013-02-16 14:21:00 -08:00
Chinsky
8b8556a1b1 Removed requirements for face surgery to cut open head too, real counterintuitive and looks like copypaste error >.> 2013-02-15 02:06:35 +04:00
cib
c5301c5144 Fixes issue #2296: Humans will not react to sleep toxins in smaller amounts than can be scrubbed. 2013-02-14 15:06:10 +01:00