cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,406 Commits 10 Branches 0 Tags
e6c70937e538fc6c65e0956db8142cf779db78ce
Commit Graph

7997 Commits

Author SHA1 Message Date
Cael_Aislinn
e6c70937e5 Merge branch 'incremental_tg' r4967 (27/10/2012) into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/__HELPERS/game.dm
	code/__HELPERS/type2type.dm
	code/datums/helper_datums/getrev.dm
	code/game/atoms.dm
	code/game/gamemodes/events.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/machinery/telecomms/telemonitor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/objs.dm
	code/modules/DetectiveWork/detective_work.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/admin.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mint.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/mob.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/photocopier.dm
	code/modules/power/gravitygenerator.dm
	html/changelog.html
	icons/mob/head.dmi
	icons/mob/human_face.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/suits.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-28 01:07:36 +10:00
Hawk-v3
346ffe618f Merge pull request #2087 from CIB/bugfix 
Fixed a bug with EMP's and robolimbs.
 2012-12-20 06:42:54 -08:00
Hawk-v3
a983b72f4d Merge pull request #2085 from GauHelldragon/master 
Various fixes
 2012-12-20 06:42:15 -08:00
cib
e0a500377c Fixes dropped cyborg limbs being human. 
Makes them cyborg parts instead.
 2012-12-19 23:30:58 +01:00
cib
2233d0dc8e Fixed a bug with EMP's and robolimbs. 
Light EMP's were much more likely to destroy robolimbs than heavy ones.
 2012-12-19 23:00:01 +01:00
GauHelldragon
980a24079f Power draining Anomoly negative charge fix 
fixes issue #2064
 2012-12-19 13:00:30 -08:00
GauHelldragon
0a5aeb2233 Cane Sprite Fix 
fixes issue #2017
 2012-12-19 12:37:58 -08: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
RavingManiac
1b756b9fe5 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-12-18 22:01:51 +08: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
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
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
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
0855c5d1af Fixes issue #2006 
Medical belt can now hold autoinjector.
 2012-12-16 04:04:43 +01:00
cib
7b8a33dc53 Fixed compile error regarding unclosed comment in events.dm 2012-12-16 03:39:45 +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
GauHelldragon
0db60b65c7 Portable generator Fix 
Portable generators properly drop their fuel when deconstructed
Portable generators need their cover open to be destructed now
Fixed a runtime error when building a portable generator with a 2s wire
 2012-12-12 02:49:29 -08:00
cib
f664e7c99d Fixes issue #2033 2012-12-11 12:07:11 +01:00
cib
c4e9afe0ae Fix issue #2048 
Disables random space ninja spawns.
 2012-12-11 11:57:22 +01:00
Mloc
9d60a87ee4 Merge pull request #2020 from GauHelldragon/master 
Service Borg Upgrade
 2012-12-10 08:44:33 -08:00
Mloc
c758a1aa94 Merge pull request #2022 from CIB/master 
Airtank stuff
 2012-12-10 08:40:52 -08:00
cib
fd4a3576d4 Fix to the improved player notes list. 2012-12-09 21:00:36 +04:00
cib
e7a54f6644 Merge branch 'master' of github.com:CIB/Baystation12 2012-12-09 19:07:49 +04:00
cib
c56974f2e8 Fixes issue #2043 
Player notes list now has a better organized interface, which should prevent BYOND overloading and dying a gruesome death.
 2012-12-09 16:04:43 +01:00
cib
a911d5de43 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-12-09 15:34:15 +01:00
cib
173236acf0 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-12-09 17:22:43 +04:00
Chinsky
2c34bd2db0 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-12-06 18:24:05 +04:00
Chinsky
d567d88749 Fixed issue with severed heads not being visible 2012-12-06 18:20:56 +04:00
cib
30f5b2077c Merge branch 'master' of github.com:CIB/Baystation12 2012-12-06 18:16:38 +04:00
cib
0201e83fcb Merge branch 'master' of github.com:CIB/Baystation12 2012-12-06 15:15:25 +01:00
cib
6ab420237b Attack log will now store type path for bullets. 2012-12-06 15:14:17 +01:00
cib
ecb12fb4db Merge branch 'master' of git://github.com/comma/Baystation12 2012-12-06 16:50:28 +04:00
Jim "Apples"
84bcc87e45 Merge pull request #2027 from SweeperM/master 
Fixes to lighting
 2012-12-03 03:09:02 -08:00
Chinsky
f0ac799952 Merge branch 'bandages' 2012-12-02 21:17:11 +04:00
cib
77943e04f3 Balance fix to random blob event. 
It now lasts 20 minutes instead of 5, and accordingly each blob
advancements happens every 30 seconds instead of every 7 seconds. This
means more time to respond to the blob, but overally the blob can still
be just as harmful if nothing is done about it.
 2012-12-02 13:58:57 +01:00
cib
bce8c4cfee Merge github.com:Baystation12/Baystation12 2012-12-02 13:36:10 +01:00
Chinsky
507dc0c496 Better feedback messages and ability to target groin, hands and feet. 2012-12-02 16:30:24 +04:00
Chinsky
66d0f554f6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-12-02 00:14:03 +04:00
Chinsky
0a9b6f6bbe Removed armor suit from Captain's spawn gear 2012-12-02 00:03:30 +04:00
Chinsky
0b614a488c Made bandages stop bleeding when applied, not waiting until next 20-tick organ update cycle. 2012-12-02 00:02:43 +04:00
Chinsky
ab440fbf7d Fixed compile error in custom items. 
Made rigs protect against radiation again.
 2012-12-01 18:35:27 +04:00
Cael_Aislinn
2f7baa26f8 antiqua fixes: tvalve, barsigns, doctor's wardrobe, high volume pump, engine areas, moving parts sign, various other areas 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-01 17:49:34 +10:00