cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-20 23:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,224 Commits 7 Branches 0 Tags
69a080e2d611c6d45cb157861cade41f05d23721
Commit Graph

17479 Commits

Author SHA1 Message Date
Loganbacca
fd53575658 Implant cases 
- Adds freedom implant in glass case variant
- Changes implants created from protolathe to variants in glass cases
 2014-12-04 20:48:45 +13:00
mwerezak
77288fb951 Merge remote-tracking branch 'upstream/dev' into camera 
Conflicts:
	code/game/machinery/portable_turret.dm
 2014-12-03 23:37:02 -05:00
PsiOmega
806e200857 Merge remote-tracking branch 'upstream/dev' into Beds 2014-12-03 23:03:43 +01:00
Ccomp5950
5fc6518e21 Merge pull request #7217 from mwerezak/syndie-suit 
Adds mask and oxygen tank to uplink kits that provide space suits.
 2014-12-03 17:02:48 -05:00
Ccomp5950
55b66b9039 Merge pull request #7220 from PsiOmegaDelta/DismantleThatWindow 
Fixes #7214.
 2014-12-03 17:02:29 -05:00
mwerezak
63aa4b1a4e Holodeck computer uses more power when active and turns off if power is lost. 
Allows players to float when using the 'Space' holodeck scenery.
Fixes holodeck deleting space carp when the scenery is changed.
Holocarp start docile and cannot leave the holodeck unless the conole is emagged.
 2014-12-03 15:04:59 -05:00
mwerezak
6a2ceeb4af Allows floating in the space holodeck scene 2014-12-03 12:55:51 -05:00
mwerezak
01fbe4b542 Fixes portable turret ex_act() 
Class 3 is the least severe, not the most.
 2014-12-03 10:36:30 -05:00
mwerezak
fad5506683 Cameras can be broken by weapons/projectiles, fixes 
Fixes being able to show papers to AIs through deactivated cameras.
Fixes being able to break doors with TOX, OXY, and CLONE damage.
Fixes camera alarms persisting after the camera is deleted.
Fixes #7021.
Some camera cleanup.
 2014-12-03 10:36:30 -05:00
PsiOmega
cb4a4d67a1 Merge remote-tracking branch 'upstream/dev' into Turrets 2014-12-03 11:38:54 +01:00
PsiOmega
52346094f8 Fixes #7214. 
Dismantling a window should now return an appropriate number of sheets for its type.
 2014-12-03 11:06:33 +01:00
PsiOmega
74d9441a1c Merge remote-tracking branch 'upstream/dev' into Beds 2014-12-03 09:06:34 +01:00
mwerezak
7049156519 Adds mask and oxygen tank to uplink kits that provide space suits. 2014-12-02 22:24:53 -05:00
Ccomp5950
19bbc4a004 Merge pull request #7212 from Loganbacca/ducttape 
Duct Tape
 2014-12-02 20:32:04 -05:00
Ccomp5950
cadfecddce Merge pull request #7202 from PsiOmegaDelta/PlasticBag 
Constructable blood packs.
 2014-12-02 20:31:12 -05:00
Ccomp5950
25224491ce Merge pull request #7195 from PsiOmegaDelta/BloodDrive 
Cargo can now order empty blood packs.
 2014-12-02 20:31:04 -05:00
Ccomp5950
f1c77dcb16 Merge pull request #7190 from PsiOmegaDelta/Topic 
Fixes exploit that lets AIs use machinery even after cameras are disabled.
 2014-12-02 20:29:47 -05:00
Snapshot
867e69c770 Merge pull request #7210 from Zuhayr/dev 
Fixes #7209
 2014-12-02 17:23:19 -08:00
Snapshot
378936c1a3 Merge pull request #7211 from Loganbacca/rigui 
Hardsuit NanoUI rewrite
 2014-12-02 17:14:46 -08:00
PsiOmegaDelta
4582c0038b Merge pull request #7205 from Mloc/bs12-setdir 
refactor 'dir = ' into 'set_dir()'
 2014-12-02 14:38:31 +01:00
Loganbacca
c5833dfb9a Allow reading of taped paper via examine 2014-12-03 00:02:47 +13:00
Loganbacca
76d87e7c84 Tape fixes 
- Shrunk tape roll sprite
- Disabled tearing off individual strips of tape until they have a use
- Fixed a runtime when removing tape with nothing stuck to it
 2014-12-02 23:45:33 +13:00
Loganbacca
26d428e659 Reverted wall repairing with tape 2014-12-02 23:17:46 +13:00
Loganbacca
224b2f3899 Duct Tape 
First pass for adding duct tape.
It can stick paper to things.
It can patch up walls (crudely).
Coder sprites!
 2014-12-02 23:17:45 +13:00
Loganbacca
3988b96459 Rig activate message fix 
Electrowarfare and power sink modules weren't displaying the correct activate string message. Fixed both.
 2014-12-02 22:24:00 +13:00
Loganbacca
9fb58d8568 Third rig UI pass 
- Resized the initial ui window again
- Rewrote the modules section to a horizontal layout
 2014-12-02 22:23:59 +13:00
Loganbacca
0f2b0b79bd Initial rig ui pass 
- Narrowed UI window, we shouldn't need it this wide once I'm done
- Started converting html template to divs for easier formatting
 2014-12-02 22:23:59 +13:00
PsiOmegaDelta
529a610613 Merge pull request #7197 from Amunak/patch-1 
Supermatter and SMES coil supply pack price changes
 2014-12-02 07:21:40 +01:00
PsiOmegaDelta
b05c966b64 Merge pull request #7198 from atlantiscze/interactions 
(mostly) silicon adjustments/features
 2014-12-02 07:20:58 +01:00
PsiOmegaDelta
d6ea2b887a Merge pull request #7201 from SparklySheep/patch-9 
Adds pAI cards to the loadout.
 2014-12-02 07:20:50 +01:00
Zuhayr
8e2b0978a8 Fixes #7209 2014-12-02 11:26:44 +10:30
PsiOmega
c936e2bb4f Bed and mercenary shuttle refactoring. 
Re-arranges the dormitory bedrooms again. Slightly fewer beds, slightly more maintenance.
Re-shapes the mercenary shuttle airlock and docking points to restore the cabin compartment shape.
Gives the xeno/viro some raison d'être until a something more can be done about it.
 2014-12-01 22:31:31 +01:00
Zuhayr
17f32c3ab3 Replacing a loop with the older code. 2014-12-02 02:58:26 +10:30
Zuhayr
33406d6e47 Removing macros. 2014-12-02 02:51:14 +10:30
Zuhayr
42c6efbc61 Fixes most of #7206, fixes #7200, fixes #7184 2014-12-02 02:34:34 +10:30
Mloc-Argent
117ca6a135 refactor 'dir = ' into 'set_dir()' 
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-12-01 13:44:02 +00:00
Zuhayr
8240f14176 Fixes #7185, works on #7184 2014-12-01 23:55:03 +10:30
PsiOmegaDelta
a1a66870ca Merge pull request #7203 from Zuhayr/unarmed 
Refactoring the context-based combat PR v2
 2014-12-01 11:17:14 +01:00
Zuhayr
487117a0ae Reverting a now unneeded var change. 2014-12-01 20:42:32 +10:30
Zuhayr
bee0b9d23d Tweaks after testing. 2014-12-01 20:20:30 +10:30
Zuhayr
d65ead4f7e Changed \red to span in unarmed_attack.dm. 2014-12-01 20:10:27 +10:30
Zuhayr
0ae473b6ea Removed antag role buffs. 2014-12-01 20:06:43 +10:30
Zuhayr
855f75bd3c Removed magboot stomp. 2014-12-01 20:03:08 +10:30
PsiOmega
8f342ada74 Constructable blood packs. 
Can now make your own blood packs from plastic.
 2014-12-01 08:40:58 +01:00
PsiOmegaDelta
e18d5f51f9 Merge pull request #7172 from Neerti/11_29_14_minor_borg_drone_changes 
Minor changes to drone borg sprite.
 2014-12-01 06:46:46 +01:00
PsiOmegaDelta
651008b822 Merge pull request #7176 from Amunak/super-patch 
Supermatter fixes, code cleanup and refactoring. Shards don't announce anything.
 2014-12-01 06:46:28 +01:00
SparklySheep
f8bc1708af Lowered to 2 points. 2014-11-30 23:20:24 -06:00
SparklySheep
0a43dd0860 Adds pAI cards to the loadout. 2014-11-30 23:12:04 -06:00
Zuhayr
016a9d8ba2 Merge branch 'unarmed' of https://github.com/Zuhayr/Baystation12 into unarmed 2014-12-01 15:33:07 +10:30
PsiOmegaDelta
e5c5209f7a Merge pull request #7183 from Zuhayr/dev 
Hardsuit fixes.
 2014-12-01 05:58:24 +01:00