cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-29 19:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,644 Commits 7 Branches 0 Tags
5bc64c3db3b0cefcd449feebd80aee048ac669c9
Commit Graph

3672 Commits

Author SHA1 Message Date
Zuhayr
1eb759447e Merge resolution, using dev-freeze map due to unreconcilable conflicts. 2014-09-13 16:54:48 +09:30
mwerezak
716c6ab3ef APC cell_type is now an actual power cell type 2014-09-10 22:12:43 -04:00
Zuhayr
0b6b3d8e0e Merge pull request #6253 from mwerezak/skrell 
Hardsuit refitting sprite sheet
 2014-09-03 12:06:18 +09:30
mwerezak
30464da6ef Allows refitting to change worn sprite 2014-09-02 08:31:16 -04:00
Whitellama
71c2317264 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into flame 
Conflicts:
	code/game/objects/items/weapons/storage/belt.dm
 2014-09-01 18:31:26 -07:00
Zuhayr
aedb3725f2 Fixes #5874 2014-09-01 23:20:27 +09:30
Zuhayr
066772b1ce Fixes #5879 2014-09-01 22:45:37 +09:30
Zuhayr
74d9b1bf2d Fixes #6178 2014-09-01 22:15:45 +09:30
Zuhayr
059532c155 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-09-01 22:03:29 +09:30
Whitellama
9cd42a3f33 Changes candle.dm procs to absolute paths 2014-08-31 19:48:34 -07:00
Whitellama
d536f7d56a Fixed police tape not going in tactical combat belts 2014-08-31 15:34:21 -07:00
Whitellama
dae602a2ec Fixes tank dispenser sprite not updating icons when a tank is added 2014-08-31 15:22:13 -07:00
Whitellama
f5c9586153 Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer. 2014-08-31 02:12:04 -07:00
Ccomp5950
97468655bd Merge pull request #6205 from Kelenius/OfPortalsAndHands 
Made portals clickable
 2014-08-29 03:49:00 -05:00
Kelenius
285da89464 Made portals clickable 2014-08-28 22:04:20 +04:00
Walter0o
c0b6f82ad0 emergency HTML/JS injection fix MK2, the underping. 
fixes a minor oversight in proc order after i shuffled them around.
 2014-08-27 15:42:59 +02:00
Walter0o
89d2c956ca emergency HTML/JS injection fix. 
sanitation of status display input was missing everywhere.
 2014-08-27 14:42:58 +02:00
Zuhayr
772715f2da Merged dev-freeze into master. Two map conflicts, used dev-freeze map. 2014-08-27 20:46:04 +09:30
mwerezak
9859fc0b00 Fixes #6118 2014-08-25 21:02:57 -04:00
Chinsky
2c73f3b2d5 Merge pull request #6107 from mwerezak/dev-fixes 
Fixes rad suits not completely protecting against radiation
 2014-08-24 01:58:26 +04:00
mwerezak
ababfc1d0c Merge remote-tracking branch 'upstream/dev-freeze' into dev-fixes 
Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
 2014-08-22 01:24:34 -04:00
mwerezak
1477fe17ab Fixes apply_effect() used without armour checks 2014-08-22 00:02:50 -04:00
Raptor1628
5a030ac82b Brig Fixes Clean 
Includes all the previous fixes, plus removes loyalty implants from HoS
locker
 2014-08-21 20:58:00 -04:00
Zuhayr
ee499426ad Compile fixes. 2014-08-21 12:19:10 +09:30
Zuhayr
b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
Ccomp5950
264aee843f Merge pull request #6063 from Whitellama/master 
Fixed eggs not going back into egg boxes
 2014-08-19 06:23:57 -05:00
Ccomp5950
25506f33fa Merge pull request #6032 from Walter0o/low_pressure_fix 
fixes #6005 and broken ancient human low/high pressure code.
 2014-08-19 05:54:30 -05:00
Whitellama
26721cf0d5 Fixed eggs not going back into egg boxes 2014-08-19 02:44:58 -07:00
Chinsky
f9a07a16ef Merge pull request #6031 from Whitellama/master 
Adds logs/fingerprints preventing welding fuel grief.
 2014-08-18 15:35:14 +04:00
Graham Lloyd
75305a0ec4 Comfy chair update, makes armrests show up. 2014-08-17 22:48:38 -04:00
Whitellama
7ced8104ca Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/objects/items/devices/transfer_valve.dm
 2014-08-17 17:50:07 -07:00
Zuhayr
2033923f8f Merge pull request #6018 from Hubblenaut/master 
Patch of fixes for bugs and oversights
 2014-08-18 09:28:17 +09:30
Zuhayr
b99525dc07 Merge pull request #5999 from GinjaNinja32/LetMeDrive 
Allows wheelchair occupants to drive if the driving mob is incapacitated
 2014-08-18 09:22:32 +09:30
Whitellama
7539a6a5bb Added a JMP button to logs when someone adds something to a transfer valve. 2014-08-17 16:06:07 -07:00
Walter0o
e8592d4f41 fixes #6005 and broken ancient human low/high pressure code. 
-fixes low/high pressure not damaging unsealed/damaged spacesuits.
-refactors procs and adds more comments.
-removes unused/dead code.
 2014-08-17 18:06:30 +02:00
Whitellama
da93b893ce Fixed silly typo. 2014-08-17 03:03:17 -07:00
Whitellama
4bfd59c8d7 Renamed an argument to h ave clearer meaning. 2014-08-17 02:54:35 -07:00
Whitellama
f1494c9b76 Admins now get logs when welding fuel is spilled on the floor, and welding tanks gain fingerprints when someone gets fuel from them. 2014-08-17 02:48:08 -07:00
Hubblenaut
15ae5ca2a9 Adds JMP button to certain admin logs 2014-08-17 02:21:21 +02:00
Walter0o
f5ca79d003 fixes building more than 1 grille per turf 
rapidly triggering attack_self() enabled building more than 1 per turf,
which is fairly abusive and not indended.
 2014-08-16 22:48:13 +02:00
Raptor1628
f1c44601e5 Brig Fixes 
Fixes a few lighting issues, brig cell doors, adds missing berets to the
wardrobe and closes disposals outlet.
 2014-08-14 18:26:17 -04:00
Chinsky
e4847b729e Merge pull request #5994 from GinjaNinja32/shards 
Stepping in shrapnel fix and unification of shard code
 2014-08-14 22:55:39 +04:00
Chinsky
07ed87ccd9 Merge pull request #5993 from GinjaNinja32/proximity2 
More proximity fixes
 2014-08-14 22:55:29 +04:00
GinjaNinja32
b52450f053 Allows wheelchair occupants to drive if the driving mob is incapacitated 2014-08-14 19:24:00 +01:00
GinjaNinja32
9b9b69f547 Use absolute paths 2014-08-14 11:20:07 +01:00
PsiOmega
6fffe8e077 Merge remote-tracking branch 'upstream/dev' into Brig2 2014-08-14 08:58:59 +02:00
Zuhayr
43a7757252 Merge pull request #5982 from Jarcolr/customs 
Adds the cigar case as a premium cigarette vending machine item.
 2014-08-14 12:02:49 +09:30
Chinsky
af9f56f164 Merge pull request #5969 from GinjaNinja32/floortiles 
Adds floor painter.
 2014-08-14 06:31:09 +04:00
Chinsky
abc587b64c Merge pull request #5971 from Lancer411/dev 
Fix for infinite loop in smokeFlow() proc.
 2014-08-14 06:31:06 +04:00
Hubblenaut
c80b921d6b Logs finishing tank transfer valve bombs and ghosting. Changes pAI request 
to state the name of the inquirer.
 2014-08-14 01:07:09 +02:00