cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,442 Commits 8 Branches 0 Tags
1d0147c396123b2f30cb800c7b9c5b5116ef79c8
Commit Graph

8032 Commits

Author SHA1 Message Date
cib
1d0147c396 Merge branch 'master' of github.com:Baystation12/Baystation12 into feature 2012-12-19 19:40:28 +01:00
cib
f769bcffb3 Fixed an indentation error. 2012-12-18 18:40:55 +01:00
cib
9427c963cb Spacesuits and helmets now protect from pressure. 
Don't want to know why they didn't before.
 2012-12-18 18:36:54 +01:00
cib
9a6cc83f48 Made the cleaver be a sharp weapon, so you can decapicate with it. 2012-12-18 18:10:28 +01:00
cib
85ec5157fe Forced antags are now logged to admins. 
This might help tell bugs from simply no one having chosen the role.
 2012-12-18 17:25:14 +01:00
Hawk-v3
7c43c3d1a6 Merge pull request #2082 from Zuhayr/master 
Fix for stun baton throwing message.
 2012-12-18 08:13:45 -08:00
Zuhayr
24473bdd19 A small fix to the throwing string when a mob is struck with a baton. 2012-12-19 01:57:47 -08:00
cib
59ed460c65 Fix a compile error. 2012-12-18 15:56:24 +01:00
RavingManiac
1b756b9fe5 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-12-18 22:01:51 +08:00
Jim "Apples"
70a82fcde6 Merge pull request #2080 from Zuhayr/master 
Oen'g's baton (Custom item)
 2012-12-18 05:14:23 -08:00
Zuhayr
d59b160f80 Oen'g's baton. 2012-12-19 00:13:19 -08:00
cib
455b0a7c3b Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature 
Conflicts:
	code/game/gamemodes/events.dm
 2012-12-18 14:08:41 +01:00
Hawk-v3
79b9285889 Merge pull request #2076 from GauHelldragon/master 
Telecomm Server circuit label fix
 2012-12-18 04:40:43 -08:00
RavingManiac
67bbd9bf2b Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-12-17 21:11:03 +08:00
GauHelldragon
d38a0715e7 Fixed design name of telecomm circuit design 
Was mislabeled, fixed!
 2012-12-16 17:41:24 -08:00
Jim "Apples"
11427734c3 Merge pull request #2073 from CIB/bugfix 
Make setblock able to handle block index 0
 2012-12-16 09:23:25 -08:00
cib
5360915221 Fixes issue #2032 
The proc to get zlevel map files used lowertext on the filename. That is bad, for obvious reasons(breaks uppercase paths on linux).
 2012-12-16 18:16:21 +01:00
cib
8512bdd8d7 Make setblock able to handle block index 0 
It will simply do nothing. Fixes issue #2049
 2012-12-16 17:45:20 +01:00
cib
ebb8a73ee3 Derp in previous commit. 
Whoops. :(
 2012-12-16 16:37:38 +01:00
cib
8355d498c7 Adjusted event chance config to new event system. 
With events adjusted to departments, events should happen a bit more often.
 2012-12-16 16:19:55 +01:00
cib
847c1efd0f Fixed a problem with events probability. 
I multiplied with "percent" chances, without dividing by 100. Would lead to permanently 100% chance of anything.
 2012-12-16 16:16:21 +01:00
cib
d94faea360 Event system now takes department activity into account. 
Pretty much an overhaul of the whole event choosing system, which makes it a bit better IMO. Ported this from my larger feature request branch.
 2012-12-16 15:15:18 +01:00
cib
d0735e9a87 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature 
Conflicts:
	code/ZAS/ZAS_Zones.dm
	code/game/gamemodes/events.dm
 2012-12-16 15:10:04 +01:00
RavingManiac
f9502a0143 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-12-16 22:08:37 +08:00
RavingManiac
1418697000 wrapsortjunction fixed - will now divert packages correctly. 
Mail chute changed a bit, as ejected packages were smashing the window door.

"Small parcel" renamed to "Parcel".
 2012-12-16 22:07:22 +08:00
cib
933e53aa98 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into minor_feature 
Conflicts:
	code/game/gamemodes/events.dm
 2012-12-16 15:02:54 +01:00
cib
679c715482 Merge branch 'master' of github.com:Baystation12/Baystation12 into minor_feature 2012-12-16 14:57:54 +01:00
Hawk-v3
9ed0e80acf Merge pull request #2058 from GauHelldragon/master 
Portable Generator Fix
 2012-12-16 05:55:56 -08:00
RavingManiac
605f981ce9 Revert ""Hidden" HE pipes added. HE piping in the kitchen cold room allows a freezer unit just outside the cold room to lower the room's temperature. A human inside the cold room with the temperature set to minimum will typically expire within a few minutes." 
This reverts commit e924aa8fc3.
 2012-12-16 20:07:30 +08:00
Zuhayr
45527ec599 Four custom items plus config.txt. 2012-12-16 00:40:04 -08:00
cib
7cf3244316 Fixes issue #2059 
Mob transform into monkey no longer uses hardcoded DNA size of 14.
 2012-12-16 04:57:32 +01:00
cib
a6d5a6a26e Removed yet another type of gib that looks like a head. 
Just how many heads does a person have, according to this code?
 2012-12-16 04:40:19 +01:00
cib
cc2057240a Fixed two compile errors. 2012-12-16 04:23:57 +01:00
cib
49958de6aa Removed loyalty implants from all security except the HoS. 
See http://baystation12.net/forums/viewtopic.php?f=5&t=6318
 2012-12-16 04:11:55 +01:00
cib
0855c5d1af Fixes issue #2006 
Medical belt can now hold autoinjector.
 2012-12-16 04:04:43 +01:00
cib
16a31a0cc3 Fixes issue #2053 
Shuttle doors now close just before the shuttle leaves.
 2012-12-16 03:59:32 +01:00
cib
caf56c4c7d Merge branch 'bugfix' into minor_feature 2012-12-16 03:41:32 +01:00
cib
a6d1a666a9 Merge branch 'bugfix' into feature 
Conflicts:
	code/game/gamemodes/events.dm
 2012-12-16 03:41:11 +01:00
cib
7b8a33dc53 Fixed compile error regarding unclosed comment in events.dm 2012-12-16 03:39:45 +01:00
cib
9c4a48ffe5 Gibbing now creates actual limbs instead of decals. 
Especially useful for the head, but also pretty nice in that you can now pick the limbs up and mail them to security.
 2012-12-16 03:25:26 +01:00
cib
62d88717ba Fixed a bug with rev objective checking. 
If a single alive, non-converted head left the station z-level, it'd be a victory for the revs.
 2012-12-16 00:18:50 +01:00
Jim "Apples"
cff920917b Merge pull request #2054 from caelaislinn/work_in_progress 
Various
 2012-12-15 04:08:07 -08:00
Zuhayr
aedf5f2068 Ty Foster's custom necklace, Butcher Royce's custom Ripley skin and some minor changes to support it. 2012-12-15 02:08:03 -08:00
Cael_Aislinn
67b0e79b29 removed vermin spawn turf selection (was causing a short freeze at roundstart) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-15 12:40:23 +10:00
Cael_Aislinn
50c4c120ba space ninja candidates have a timed popup asking the player if they accept (using ShadowDarke's sd_Alert), minor formatting cleanups 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-15 12:39:22 +10:00
Cael_Aislinn
b7804cc295 Merge remote-tracking branch 'remotes/Baystation12/Baystation12/bleeding-edge-freeze' into work_in_progress 2012-12-15 00:39:16 +10:00
Cael_Aislinn
d1cf168480 Merge remote-tracking branch 'remotes/Baystation12/Baystation12/master' into work_in_progress 2012-12-15 00:39:07 +10:00
Cael_Aislinn
df37dd4e75 significantlyt sped up temperature and pressure equalization when merging zones or hull breaches 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-15 00:36:39 +10:00
Zuhayr
6c3aec4198 Nasir's custom medallion. 2012-12-14 00:14:24 -08:00
Zuhayr
f8af31bdda Three custom items: Ana Ka'Rimah, Jane Doe, Altair An-Nasaqan. 2012-12-13 02:40:45 -08:00