cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,769 Commits 10 Branches 0 Tags
68abeda762e03de2ef5162ebb51acc4fcf47daca
Commit Graph

9023 Commits

Author SHA1 Message Date
Cael_Aislinn
68abeda762 when players arrive, they are assigned a new account with random starting funds and the info for it is stored in their memory + ID card. id computer can now modify the account number associated with id cards 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-23 19:38:50 +10:00
Cael_Aislinn
cfa317a664 added [old] roundstart music, cleaned up folders a bit 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-23 18:54:01 +10:00
Cael_Aislinn
a5a8caeb00 fixed compile error 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-23 02:30:32 +10:00
Cael_Aislinn
3c3d19ade8 added missing config links, added holder rights check to hearing deadchat 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-23 01:31:52 +10:00
Cael_Aislinn
59c96782d0 fixed up some derps with admin ooc colour 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-23 01:18:55 +10:00
Cael_Aislinn
43e58aacbb new unathi hair styles 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-23 00:46:33 +10:00
Cael_Aislinn
389be7d4cf NPC mice periodically fall asleep 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-23 00:45:48 +10:00
Cael_Aislinn
306cffb46c Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	code/modules/events/event_manager.dm
	code/modules/events/infestation.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-22 23:59:38 +10:00
Cael_Aislinn
8ee5672159 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-22 23:56:38 +10:00
Cael_Aislinn
2c585fbcc4 moved shield files to folder, made circuitry for shielding gens/caps researchable, various tweaks and balances to the research requirements, made shield gens/capacitors orderable via cargo 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-22 23:49:29 +10:00
Cael_Aislinn
bdf1589cc2 made rogue vending machines revert after event end, reduced chance of machines going rogue 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-22 22:42:25 +10:00
Cael_Aislinn
4052e98723 made circuitboards for fuel injectors and rust core, made said circuits researchable, miscellaneous tweaks and cleanups 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-22 22:41:59 +10:00
cib
947d69be69 Removes random side-effects being caused by most medicine. 
Cryo and cloning will still cause it.
 2013-02-22 13:33:49 +01:00
Cael_Aislinn
66b04ccf1d made circuits to construct RUST computers researchable, made circuits to construct wall mounted RUST machinery researchable, made other RUST machinery orderable via QM 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-22 20:00:05 +10:00
Cael_Aislinn
7f9c95526d consolidated icons 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-22 19:51:28 +10:00
Cael_Aislinn
d477b7230f reworked rust components to integrate more smoothly with each other, cleaned up a bunch of useability issues, made all relevant components portable, fixed some random bugs, added a mostly nonfunctional map to show an example layout (based on antiqua's engineering layout) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-22 16:39:42 +10: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
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